ibusCandidatePopup: Fix scaling set-cursor-location-relative signal handling

Need to convert the raw coordinates to the scaled ones in gnome-shell.
IBus GtkIMModule can calculate the relative coordinates and gnome-shell
needs to provide the actual scale.

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8424
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3729>
(cherry picked from commit 2b2456e87d02b36fa85cdf434011f44143688215)

diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js
index 0bb4e47ee2e8e155d92cb5aa972123763d6a258c..6389f558e5ee769efa978ed4eae4f02674417d50 100644 (file)
--- a/js/ui/ibusCandidatePopup.js
+++ b/js/ui/ibusCandidatePopup.js
@@ -222,11 +222,13 @@ class IbusCandidatePopup extends BoxPointer.BoxPointer {
                 let rect = new Mtk.Rectangle({x, y, width: w, height: h});
                 rect = focusWindow.protocol_to_stage_rect(rect);
                 const windowActor = focusWindow.get_compositor_private();
+                // IBus GtkIMModule cannot get the shell scale.
+                const scale = windowActor.get_resource_scale();
                 this._setDummyCursorGeometry(
-                    windowActor.x + rect.x,
-                    windowActor.y + rect.y,
-                    rect.width,
-                    rect.height);
+                    windowActor.x + rect.x / scale,
+                    windowActor.y + rect.y / scale,
+                    rect.width / scale,
+                    rect.height / scale);
             });
         } catch {
             // Only recent IBus versions have support for this signal